Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce nRF7120 SoC and board definitions to sdk-nrf #20070

Open
wants to merge 8 commits into
base: main
Choose a base branch
from

Conversation

rob-robinson-14
Copy link

PR containing out of tree definitions for nrf7120.

@rob-robinson-14 rob-robinson-14 requested review from a team as code owners January 24, 2025 12:44
@CLAassistant
Copy link

CLAassistant commented Jan 24, 2025

CLA assistant check
All committers have signed the CLA.

@github-actions github-actions bot added the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Jan 24, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Jan 24, 2025

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 26

Inputs:

Sources:

sdk-nrf: PR head: 7ca5f91354ff23165cf965b278e2996d3e1c6cc7

more details

sdk-nrf:

PR head: 7ca5f91354ff23165cf965b278e2996d3e1c6cc7
merge base: 085e5a678ca84a3b5c8cd2e0c3b41de872f4b9cf
target head (main): 30bd02b2229f9836f5eca6dd02ea273f110f6514
Diff

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (39)
CODEOWNERS
boards
│  ├── nordic
│  │  ├── nrf7120pdk
│  │  │  ├── Kconfig.defconfig
│  │  │  ├── Kconfig.nrf7120pdk
│  │  │  ├── board.cmake
│  │  │  ├── board.yml
│  │  │  ├── nrf7120_cpuapp_common.dtsi
│  │  │  ├── nrf7120pdk_nrf7120-common.dtsi
│  │  │  ├── nrf7120pdk_nrf7120-pinctrl.dtsi
│  │  │  ├── nrf7120pdk_nrf7120_cpuapp.dts
│  │  │  ├── nrf7120pdk_nrf7120_cpuapp.yaml
│  │  │  ├── nrf7120pdk_nrf7120_cpuapp_defconfig
│  │  │  ├── nrf7120pdk_nrf7120_cpuapp_ns.dts
│  │  │  ├── nrf7120pdk_nrf7120_cpuapp_ns.yaml
│  │  │  ├── nrf7120pdk_nrf7120_cpuapp_ns_defconfig
│  │  │  ├── nrf7120pdk_nrf7120_cpuflpr.dts
│  │  │  ├── nrf7120pdk_nrf7120_cpuflpr.yaml
│  │  │  ├── nrf7120pdk_nrf7120_cpuflpr_defconfig
│  │  │  ├── nrf7120pdk_nrf7120_cpuflpr_xip.dts
│  │  │  ├── nrf7120pdk_nrf7120_cpuflpr_xip.yaml
│  │  │  │ nrf7120pdk_nrf7120_cpuflpr_xip_defconfig
dts
│  ├── arm
│  │  ├── nordic
│  │  │  │ nrf7120_enga_cpuapp.dtsi
│  ├── common
│  │  ├── nordic
│  │  │  ├── nrf7120_enga.dtsi
│  │  │  │ nrf7120_enga_secure_peripherals.dtsi
│  ├── riscv
│  │  ├── nordic
│  │  │  │ nrf7120_enga_cpuflpr.dtsi
soc
│  ├── nordic
│  │  ├── CMakeLists.txt
│  │  ├── Kconfig
│  │  ├── Kconfig.soc
│  │  ├── nrf71
│  │  │  ├── CMakeLists.txt
│  │  │  ├── Kconfig
│  │  │  ├── Kconfig.defconfig
│  │  │  ├── Kconfig.defconfig.nrf7120_enga_cpuapp
│  │  │  ├── Kconfig.defconfig.nrf7120_enga_cpuflpr
│  │  │  ├── Kconfig.soc
│  │  │  ├── align.ld
│  │  │  ├── kmu_push_area_section.ld
│  │  │  ├── soc.c
│  │  │  │ soc.h
│  │  │ soc.yml
zephyr
│  │ module.yml

Outputs:

Toolchain

Version: 342151af73
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:342151af73_912848a074

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
    • sdk-nrf test count: 251
  • ✅ Integration tests
Disabled integration tests
    • desktop52_verification
    • doc-internal
    • test_ble_nrf_config
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_mesh
    • test-fw-nrfconnect-ble_samples
    • test-fw-nrfconnect-boot
    • test-fw-nrfconnect-chip
    • test-fw-nrfconnect-fem
    • test-fw-nrfconnect-nfc
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_mosh
    • test-fw-nrfconnect-nrf-iot_positioning
    • test-fw-nrfconnect-nrf-iot_samples
    • test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • test-fw-nrfconnect-nrf-iot_thingy91
    • test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • test-fw-nrfconnect-nrf_crypto
    • test-fw-nrfconnect-ps
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-rs
    • test-fw-nrfconnect-tfm
    • test-fw-nrfconnect-thread
    • test-fw-nrfconnect-zigbee
    • test-low-level
    • test-sdk-audio
    • test-sdk-dfu
    • test-sdk-find-my
    • test-sdk-mcuboot
    • test-sdk-pmic-samples
    • test-sdk-sidewalk
    • test-sdk-wifi
    • test-secdom-samples-public

Note: This message is automatically posted and updated by the CI

@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link.

Note: This comment is automatically posted by the Documentation Publish GitHub Action.

soc/nordic/Kconfig Outdated Show resolved Hide resolved
soc/nordic/Kconfig Outdated Show resolved Hide resolved
soc/nordic/Kconfig.defconfig Outdated Show resolved Hide resolved
soc/nordic/Kconfig.soc Outdated Show resolved Hide resolved
soc/nordic/nrf71/CMakeLists.txt Outdated Show resolved Hide resolved
soc/nordic/nrf71/Kconfig.soc Outdated Show resolved Hide resolved
soc/nordic/nrf71/soc.c Outdated Show resolved Hide resolved
soc/nordic/soc.yml Outdated Show resolved Hide resolved
boards/nordic/nrf7120pdk/Kconfig.defconfig Outdated Show resolved Hide resolved
boards/nordic/nrf7120pdk/Kconfig.nrf7120pdk Outdated Show resolved Hide resolved
@nordicjm
Copy link
Contributor

also shouldn't be e.g. noup in sdk-nrf commit titles, that is for sdk-* OSS repos only

@rob-robinson-14 rob-robinson-14 force-pushed the NRFX-6596-add-nrf7120-soc-board-definitions branch 2 times, most recently from b6ae797 to 338f9ac Compare January 24, 2025 16:03
@rob-robinson-14 rob-robinson-14 force-pushed the NRFX-6596-add-nrf7120-soc-board-definitions branch from 338f9ac to 58c71c8 Compare January 27, 2025 10:27
dts/arm/nordic/nrf7120_enga.dtsi Outdated Show resolved Hide resolved
dts/arm/nordic/nrf7120_enga.dtsi Outdated Show resolved Hide resolved
dts/riscv/nordic/nrf7120_enga_cpuflpr.dtsi Outdated Show resolved Hide resolved
dts/riscv/nordic/nrf7120_enga_cpuflpr.dtsi Outdated Show resolved Hide resolved
dts/riscv/nordic/nrf7120_enga_cpuflpr.dtsi Outdated Show resolved Hide resolved
Comment on lines 8 to 12
config NRF_MPC_REGION_SIZE
hex
default 0x1000
help
Region size for the Memory Protection Controller (MPC) in bytes.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be in dts

boards/nordic/nrf7120pdk/Kconfig Outdated Show resolved Hide resolved
@rob-robinson-14 rob-robinson-14 force-pushed the NRFX-6596-add-nrf7120-soc-board-definitions branch from 58c71c8 to d1e423f Compare January 29, 2025 13:11
@rob-robinson-14 rob-robinson-14 force-pushed the NRFX-6596-add-nrf7120-soc-board-definitions branch 2 times, most recently from 501616d to f73fc0b Compare January 29, 2025 17:05
@krish2718 krish2718 self-requested a review January 29, 2025 20:05
dts/arm/nordic/nrf7120_enga.dtsi Outdated Show resolved Hide resolved
soc/nordic/Kconfig Outdated Show resolved Hide resolved
boards/nordic/nrf7120pdk/board.yml Show resolved Hide resolved
boards/nordic/nrf7120pdk/Kconfig Outdated Show resolved Hide resolved
dts/arm/nordic/nrf7120_enga.dtsi Outdated Show resolved Hide resolved
@rob-robinson-14 rob-robinson-14 force-pushed the NRFX-6596-add-nrf7120-soc-board-definitions branch from f73fc0b to 40b3dc2 Compare January 30, 2025 10:57
@github-actions github-actions bot removed the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Jan 30, 2025
@rob-robinson-14
Copy link
Author

@nrfconnect/ncs-code-owners
Unsure who the code owners should be - please advise if these needs revising.

@rob-robinson-14 rob-robinson-14 force-pushed the NRFX-6596-add-nrf7120-soc-board-definitions branch from 2de9ef1 to 8f5f539 Compare January 30, 2025 17:34
@Hi-Im-David Hi-Im-David force-pushed the NRFX-6596-add-nrf7120-soc-board-definitions branch from 8f5f539 to 0c54122 Compare January 31, 2025 11:43
@Hi-Im-David Hi-Im-David force-pushed the NRFX-6596-add-nrf7120-soc-board-definitions branch 3 times, most recently from f8059d9 to 265b144 Compare January 31, 2025 15:49
@rob-robinson-14 rob-robinson-14 force-pushed the NRFX-6596-add-nrf7120-soc-board-definitions branch 5 times, most recently from cac233a to 91b3e86 Compare January 31, 2025 18:25
boards/nordic/nrf7120pdk/Kconfig.defconfig Outdated Show resolved Hide resolved
boards/nordic/nrf7120pdk/board.yml Outdated Show resolved Hide resolved
dts/arm/nordic/nrf7120_enga.dtsi Outdated Show resolved Hide resolved
dts/arm/nordic/nrf7120_enga.dtsi Outdated Show resolved Hide resolved
dts/arm/nordic/nrf7120_enga.dtsi Outdated Show resolved Hide resolved
# at a specific address in memory using the Zephyr SECTION macros.
# So this assert is necessary to avoid accidentatly moving this
# section to a different address.
ASSERT(__nrf_kmu_reserved_push_area == RAM_ADDR, "Error: \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would usage of __kernel_ram_start help here?

Comment on lines +15 to +17
#ifdef __NRF_TFM__
#include <zephyr/autoconf.h>
#endif
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this compiled by tfm?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copied from 54L - nrfconnect/sdk-zephyr@e3e053f

See comment:
"We port soc.c to TF-M so that the TF-M image can do the same
configuration that would normally be done by the Zephyr image.

This is done by explicitly including autoconf.h for instance."

@rob-robinson-14 rob-robinson-14 force-pushed the NRFX-6596-add-nrf7120-soc-board-definitions branch from 91b3e86 to 02fa3b6 Compare February 3, 2025 11:47
@Hi-Im-David Hi-Im-David force-pushed the NRFX-6596-add-nrf7120-soc-board-definitions branch 2 times, most recently from 754cde3 to 1bd0368 Compare February 3, 2025 12:22
Add dts files for nRF7120

Signed-off-by: David Jewsbury <[email protected]>
Co-authored-by: Robert Robinson <[email protected]>
@Hi-Im-David Hi-Im-David force-pushed the NRFX-6596-add-nrf7120-soc-board-definitions branch from 1bd0368 to 6e18336 Compare February 3, 2025 12:24
Add nRF7120 to soc directory

Signed-off-by: Robert Robinson <[email protected]>
Co-authored-by: David Jewsbury <[email protected]>
@rob-robinson-14 rob-robinson-14 force-pushed the NRFX-6596-add-nrf7120-soc-board-definitions branch from 6e18336 to 6ccbb5c Compare February 3, 2025 17:32
Hi-Im-David and others added 6 commits February 4, 2025 15:10
Add board files for nRF7120pdk

Signed-off-by: David Jewsbury <[email protected]>
Co-authored-by: Robert Robinson <[email protected]>
This adds the nrf7120pdk/cpuapp/ns board variant to sdk-zephyr.
It allows to build nrf7120pdk with TF-M in nRF Connect SDK.

Once upstreamed to zephyr, commit will become a noup within sdk-zephyr.

This is done as a noup as the out-of-tree board extension feature is
not available. When zephyrproject-rtos/zephyr#69548 is completed this
commit can be reverted and the variant be placed in sdk-nrf.

Signed-off-by: Robert Robinson <[email protected]>
Once nrf7120 is upstreamed this commit will be noup in sdk-zephyr.

The SoftDevice Controller is a different controller than
the open source link layer with a different set of quirks.
It should therefore have its own device tree binding.

This commit converts the SoftDevice Controller driver
to use this new DTS binding instead of reusing the existing one.

This commit updates or adds additional overlays for
existing samples, applications and tests that were using the
open source link layer.

Signed-off-by: Robert Robinson <[email protected]>
nRF7120 has been added to soc folder in NCS
Therefore, soc_root needs to be added to module.yml

Signed-off-by: David Jewsbury <[email protected]>
The license agreement for files within sdk-nrf differs from what
will eventually be required from upstream zephyr.

All SPDX-License-Identifier: Apache-2.0 have been updated
to SPDX-License-Identifier: LicenseRef-Nordic-5-Clause

Signed-off-by: Robert Robinson <[email protected]>
Assigned codeowners for new nrf7120 board folder
and soc/nordic within nrf.

Signed-off-by: Robert Robinson <[email protected]>
@Hi-Im-David Hi-Im-David force-pushed the NRFX-6596-add-nrf7120-soc-board-definitions branch from 6ccbb5c to 7ca5f91 Compare February 4, 2025 15:10
#include "nrf7120pdk_nrf7120_cpuflpr.dts"

&cpuflpr_sram {
reg = <0x200e0000 DT_SIZE_K(124)>;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rob-robinson-14 this seems to be identical with the cpuflpr_sram in the main dts for FLPR - is this intended?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants